Skip to content

[Tooling] Use ReleasesV2 version as the source of truth during Code Freeze #22324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Nov 11, 2025
Merged

[Tooling] Use ReleasesV2 version as the source of truth during Code Freeze #22324

merged 3 commits into from
Nov 11, 2025
+21 −44

Conversation

@iangmaia
Copy link
Contributor

@iangmaia iangmaia commented Oct 30, 2025 •
edited
Loading

See AINFRA-1478

Description

This PR enhances the version handling added in the previous iteration to assume the version received by the code freeze lane as the source of truth, ignoring potential mismatches between the ReleasesV2 version and the project's computed version.

Testing

You can make sure the calculated release branch, current version and the next version are correctly shown in the "Continue" prompt. Just remember to answer N when asked to continue, to cancel the actual code freeze.

To avoid unexpected results, comment out the lines doing ensure_git_status_clean and Fastlane::Helper::GitHelper.checkout_and_pull(DEFAULT_BRANCH) at the beginning of the lane.

You can run the code_freeze lane, with and without the version parameters:

  • Run bundle exec fastlane code_freeze
  • Run bundle exec fastlane code_freeze version:30.6

This will be fully tested in the next release cycle during code freeze.

@iangmaia iangmaia self-assigned this Oct 31, 2025
@iangmaia iangmaia added this to the 26.4 milestone Oct 31, 2025
@iangmaia iangmaia force-pushed the iangmaia/fail-when-code-freeze-version-mismatch branch from 92ad71d to 4ee319c Compare October 31, 2025 22:23
@iangmaia iangmaia marked this pull request as ready for review October 31, 2025 22:26
@iangmaia iangmaia force-pushed the iangmaia/fail-when-code-freeze-version-mismatch branch from 4ee319c to f6b5eb1 Compare November 7, 2025 15:18
@dangermattic
Copy link
Collaborator

dangermattic commented Nov 7, 2025 •
edited
Loading

1 Warning
⚠️ This PR is assigned to the milestone 26.4. The due date for this milestone has already passed.
Please assign it to a milestone with a later deadline or check whether the release for this milestone has already been finished.

Generated by 🚫 Danger

@iangmaia iangmaia changed the title [Tooling] Fail on Version Mismatch Between ReleasesV2 and Project [Tooling] Use ReleasesV2 version as the source of truth during Code Freeze Nov 7, 2025
@iangmaia iangmaia force-pushed the iangmaia/fail-when-code-freeze-version-mismatch branch from 760d9e8 to 077ed62 Compare November 7, 2025 21:42
@twstokes
Copy link
Contributor

twstokes commented Nov 10, 2025

I applied the following patch:

diff --git a/fastlane/lanes/release.rb b/fastlane/lanes/release.rb
index 9d234d8032c..98b8d7f3c03 100644
--- a/fastlane/lanes/release.rb
+++ b/fastlane/lanes/release.rb
@@ -8,9 +8,9 @@ platform :android do
   # @param [Boolean] skip_confirm Whether to skip the confirmation prompt
   #
   lane :code_freeze do |version: nil, skip_confirm: false|
-    ensure_git_status_clean
+    #ensure_git_status_clean
 
-    Fastlane::Helper::GitHelper.checkout_and_pull(DEFAULT_BRANCH)
+    #Fastlane::Helper::GitHelper.checkout_and_pull(DEFAULT_BRANCH)
 
     # If a new version is passed, use it as source of truth from now on
     new_version = version || next_release_version

and ran bundle exec fastlane code_freeze and got:

      Code Freeze:
      • New release branch from trunk: release/26.4

      • Current release version and build code: 26.3 (1477).
      • New release version and build code: 26.4-rc-1 (1478).

Running bundle exec fastlane code_freeze version:30.6 gave me:

      Code Freeze:
      • New release branch from trunk: release/30.6

      • Current release version and build code: 26.3 (1477).
      • New release version and build code: 30.6-rc-1 (1478).

mokagio
mokagio approved these changes Nov 11, 2025
View reviewed changes
Copy link
Contributor

@mokagio mokagio left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good. Didn't test locally because @twstokes already did that.

fastlane/Fastfile Outdated
Comment on lines 114 to 115
version_name ||= VERSION_FILE.read_version_name
# Read the current release version from the .xcconfig file and parse it into an AppVersion object
Copy link
Contributor

@mokagio mokagio Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar to https://github.com/woocommerce/woocommerce-ios/pull/16296/files#r2512589279. We could move the comment back where the read happens:

Suggested change
version_name ||= VERSION_FILE.read_version_name
# Read the current release version from the .xcconfig file and parse it into an AppVersion object
# Read the current release version from `version.properties` and parse it into an AppVersion object,
# unless already provided
version_name ||= VERSION_FILE.read_version_name

or just do without:

Suggested change
version_name ||= VERSION_FILE.read_version_name
# Read the current release version from the .xcconfig file and parse it into an AppVersion object
version_name ||= VERSION_FILE.read_version_name

Copy link
Contributor Author

@iangmaia iangmaia Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍
Tried to improve all the comments for this method on 70ceff9.

@sonarqubecloud
Copy link

sonarqubecloud bot commented Nov 11, 2025

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@iangmaia iangmaia merged commit a18c70b into trunk Nov 11, 2025
22 checks passed
@iangmaia iangmaia deleted the iangmaia/fail-when-code-freeze-version-mismatch branch November 11, 2025 19:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mokagio mokagio mokagio approved these changes

@AliSoftware AliSoftware Awaiting requested review from AliSoftware

Assignees

@iangmaia iangmaia

Labels

Tooling

Projects

None yet

Milestone

26.4

Development

Successfully merging this pull request may close these issues.

5 participants

@iangmaia @dangermattic @twstokes @mokagio